vmx: Change xen macro name for Intel vmexit reason 41

This VMEXIT (reason 41) indicates MCE during a VMENTRY, the old macro
definition is misleading us.

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>

diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c
index e256f51de6c59ec20cd0dcd0d7e49775ec142bb4..13e2d7905189fe1a2204448e15ae108f21ee7854 100644 (file)
--- a/xen/arch/x86/hvm/vmx/vmx.c
+++ b/xen/arch/x86/hvm/vmx/vmx.c
@@ -2220,7 +2220,7 @@ static void vmx_failed_vmentry(unsigned int exit_reason,
     case EXIT_REASON_MSR_LOADING:
         printk("caused by MSR entry %ld loading.\n", exit_qualification);
         break;
-    case EXIT_REASON_MACHINE_CHECK:
+    case EXIT_REASON_MCE_DURING_VMENTRY:
         printk("caused by machine check.\n");
         HVMTRACE_0D(MCE);
         do_machine_check(regs);
@@ -2340,7 +2340,7 @@ asmlinkage void vmx_vmexit_handler(struct cpu_user_regs *regs)
         case EXIT_REASON_SIPI:
         case EXIT_REASON_PENDING_VIRT_INTR:
         case EXIT_REASON_PENDING_VIRT_NMI:
-        case EXIT_REASON_MACHINE_CHECK:
+        case EXIT_REASON_MCE_DURING_VMENTRY:
             break;
         default:
             v->arch.hvm_vmx.vmx_emulate = 1;

diff --git a/xen/include/asm-x86/hvm/vmx/vmx.h b/xen/include/asm-x86/hvm/vmx/vmx.h
index 97cf7635ff70d37a333e799932a1eaf410d0fdf3..631dd27959d57cfc41c972b1a1e8b24a5b24a52a 100644 (file)
--- a/xen/include/asm-x86/hvm/vmx/vmx.h
+++ b/xen/include/asm-x86/hvm/vmx/vmx.h
@@ -105,7 +105,7 @@ void vmx_update_debug_state(struct vcpu *v);
 #define EXIT_REASON_MONITOR_TRAP_FLAG   37
 #define EXIT_REASON_MONITOR_INSTRUCTION 39
 #define EXIT_REASON_PAUSE_INSTRUCTION   40
-#define EXIT_REASON_MACHINE_CHECK       41
+#define EXIT_REASON_MCE_DURING_VMENTRY  41
 #define EXIT_REASON_TPR_BELOW_THRESHOLD 43
 #define EXIT_REASON_APIC_ACCESS         44
 #define EXIT_REASON_EPT_VIOLATION       48